gtk/gtkoptionmenu.c make option menus work when some of the menuitems are

Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>

	* gtk/gtkoptionmenu.c
	* gtk/gtkmenushell.c: make option menus work when some of the
	menuitems are hidden - previously, option menu would popup too
	high.

diff --git a/ChangeLog b/ChangeLog
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ec2d41c0c9d35aac637a768c9955c1cba3729d42..f930308c067f075eb40975cdd37d30e1ac29cb39 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Nov  1 21:00:06 GMT 1998  Austin Donnelly  <austin@greenend.org.uk>
+
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkmenushell.c: make option menus work when some of the
+       menuitems are hidden - previously, option menu would popup too
+       high.
+
 1998-10-31  Raja R Harinath  <harinath@cs.umn.edu>
 
        * gtk/gtkfeatures.h.in: Remove `#pragma }'.

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index a6a3bb20df932db136645233e4aa9072714b583d..ad909662116228f4fbbda87acd43fe73a891e4b3 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -868,7 +868,9 @@ gtk_menu_shell_move_selected (GtkMenuShell  *menu_shell,
        {
          node = node->next;
          while (node != start_node && 
-                (!node || !GTK_WIDGET_SENSITIVE (node->data)))
+                (!node ||
+                 !GTK_WIDGET_SENSITIVE (node->data) ||
+                 !GTK_WIDGET_VISIBLE (node->data) ))
            {
              if (!node)
                node = menu_shell->children;
@@ -880,7 +882,9 @@ gtk_menu_shell_move_selected (GtkMenuShell  *menu_shell,
        {
          node = node->prev;
          while (node != start_node &&
-                (!node || !GTK_WIDGET_SENSITIVE (node->data)))
+                (!node ||
+                 !GTK_WIDGET_SENSITIVE (node->data) ||
+                 !GTK_WIDGET_VISIBLE (node->data) ))
            {
              if (!node)
                node = g_list_last (menu_shell->children);

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index aadbc7e15580b0a487128ec3bad793692066fcdf..6f520156f30ec4723f592de4d7c9de04d1b48fee 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -637,7 +637,9 @@ gtk_option_menu_position (GtkMenu  *menu,
       if (active == child)
        break;
 
-      menu_ypos -= child->allocation.height;
+      if (GTK_WIDGET_VISIBLE (child))
+       menu_ypos -= child->allocation.height;
+
       children = children->next;
     }